projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4de4d6a f0a211a)
Merge master into places-sidebar to keep up with development
authorFederico Mena Quintero <federico@gnome.org>
Fri, 19 Oct 2012 16:35:22 +0000 (11:35 -0500)
committerFederico Mena Quintero <federico@gnome.org>
Fri, 19 Oct 2012 16:35:22 +0000 (11:35 -0500)
1  2 
gtk/Makefile.am patch | diff1 | diff2 | blob | history
gtk/gtkfilechooserdefault.c patch | diff1 | diff2 | blob | history
gtk/gtkmarshalers.list patch | diff1 | diff2 | blob | history
po/POTFILES.in patch | diff1 | diff2 | blob | history

diff --cc gtk/Makefile.am
Simple merge
diff --cc gtk/gtkfilechooserdefault.c
Simple merge
diff --cc gtk/gtkmarshalers.list
Simple merge
diff --cc po/POTFILES.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.